Call gdk_window_get_pointer() on menu->bin_window not menu->window, so we

Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
        Call gdk_window_get_pointer() on menu->bin_window not
        menu->window, so we get the correct window for the
        menu item. (#65213, Guillermo S. Romero)

diff --git a/ChangeLog b/ChangeLog
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2d828a0f1bcffe87812639c41035ce5911ab9443..0200bdfe839de60dd875f9a24190fb2e76eaffda 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Dec 27 15:38:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_stop_navigating_submenu_cb):
+       Call gdk_window_get_pointer() on menu->bin_window not
+       menu->window, so we get the correct window for the
+       menu item. (#65213, Guillermo S. Romero)
+
 Thu Dec 27 15:13:44 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_set_title): Allow unsetting

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 7041510f9a76443d2c943ad1c6ea1ab690fd1114..133c9fe8879f32fd64b5cf85d5673164e6c115e2 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2037,7 +2037,7 @@ gtk_menu_stop_navigating_submenu_cb (gpointer user_data)
   
   if (GTK_WIDGET_REALIZED (menu))
     {
-      child_window = gdk_window_get_pointer (GTK_WIDGET (menu)->window, NULL, NULL, NULL);
+      child_window = gdk_window_get_pointer (menu->bin_window, NULL, NULL, NULL);
 
       if (child_window)
        {